; Fix stray merge conflict

diff --git a/etc/HELLO b/etc/HELLO
index 1c4381c3e27502d9410ec5b8a19bd083ca9c37f1..33e664e83419d8d9f9467a1fcde7529de45bc902 100644 (file)
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -123,11 +123,6 @@ along with GNU Emacs.  If not, see <<https://www.gnu.org/licenses/>.
 ;;; Local Variables:
 ;;; tab-width: 32
 ;;; bidi-display-reordering: t
-<<<<<<< HEAD
 ;;; coding: utf-8
-;;; End:</x-charset>
-=======
-;;; coding: iso-2022-7bit
 ;;; inhibit-compacting-font-caches: t
-;;; End:
->>>>>>> 008b263
+;;; End:</x-charset>